Updated for new config classes
Updated for new config classes