Use a dictionary if necessary (40/48)

Use a dictionary if necessary