Use a dictionary if necessary (14/48)

Use a dictionary if necessary