More changes to manifest, add d2 everything