Further migration of old config to new config