Refactored all of the entities