Use a dictionary if necessary (12/48)

Use a dictionary if necessary