Use PreValidateHookMixin instead of duplicated methods (OMS-369)