Use a dictionary if necessary (9/48)

Use a dictionary if necessary