Improved configuration mechanism.