Use a dictionary if necessary (11/48)

Use a dictionary if necessary