This is not required if the class is refactored to work with the dictionary only