Use a dictionary if necessary (22/48)

Use a dictionary if necessary