Improved configuration options