Use a dictionary if necessary (4/48)

Use a dictionary if necessary