NOREF: Some extensive reconstruction of this manifest to get it working