Finished new config system