Upgrade packages to use new decoration APIs