More changes
Moved all config into central object