Update manifest work (WIP)