Use a dictionary if necessary (16/48)

Use a dictionary if necessary