A bit more dummy work on manifests...