Enhance validations