Cleanup. Changed the way configurations are loaded