Refactored model level definitions