Use a dictionary if necessary (42/48)

Use a dictionary if necessary