Updated to use the new config classes