Made some changes to reflect the new config layout