Support policy type upgrade