Implement new config system