Improved config.