Still working on config validator plus factory refactoring