Switch over to new config