Use a dictionary if necessary (41/48)

Use a dictionary if necessary