Use a dictionary if necessary (39/48)

Use a dictionary if necessary