Use a dictionary if necessary (7/48)

Use a dictionary if necessary