Make some fields in the manifests optional