Use a dictionary if necessary (36/48)

Use a dictionary if necessary