Updates for enhanced configuration support. refs #104