Updated for new config manager