Improvements to manifests