More logic in Config class
Adds namespacing