Validators added back in