Re-work legacy manifest