CLDIDE-1749; Factory validator interface changes;