Refactored model controls