Use a dictionary if necessary (3/48)

Use a dictionary if necessary