Added new config classes and ported existing config to xml file