Validation moved to Utility