Use a dictionary if necessary (17/48)

Use a dictionary if necessary