Use a dictionary if necessary (30/48)

Use a dictionary if necessary