Use a dictionary if necessary (20/48)

Use a dictionary if necessary