Rework manifest (fix)