Use a dictionary if necessary (34/48)

Use a dictionary if necessary