Upgrade packages, initial implementation of tagging