Use a dictionary if necessary (46/48)

Use a dictionary if necessary