Use a dictionary if necessary (23/48)

Use a dictionary if necessary