Refactored model constants