Use a dictionary if necessary (31/48)

Use a dictionary if necessary