Refactored bounds model