Refactored model objects and loaders