Changes to Manifest and versioning