Configuration enhancements.