Improvements to the config system, Should now work as expected