Improved config system.