Use a dictionary if necessary (21/48)

Use a dictionary if necessary