Use a dictionary if necessary (47/48)

Use a dictionary if necessary