Improved validations