Heavy re-write of manifests. Previously did not work as expected