Use a dictionary if necessary (48/48)

Use a dictionary if necessary