Validations are now set more properly