Use a dictionary if necessary (2/48)

Use a dictionary if necessary