Manifest template improvements