Allow to return valid factory from Factory validator. It will remove double factory parsing