Rework manifest