Refactoring; added a struct to use as model instead of a dictionary.