Enhanced validations