Configuration enhancements related to #2