Use a dictionary if necessary (38/48)

Use a dictionary if necessary