Use a dictionary if necessary (10/48)

Use a dictionary if necessary