ConfigBuilder refactor and comments
GenericXml updated and tested