Adapt to manifest api changes