Refactored model classes constructors