Continuing to refine the ConfigModel and parsing of config files to generate the model