Improved config options