[BUGFIX] DataValidate was being instantiated when it shouldn't be.