Use a dictionary if necessary (37/48)

Use a dictionary if necessary