Use a dictionary if necessary (8/48)

Use a dictionary if necessary