Fixed CFG object to be more like a global config store