Improved Configuration