Config enhancements