Updated for new config classes