Significantly improved validations