Use a dictionary if necessary (6/48)

Use a dictionary if necessary