Moved validate in Validator