Manifest update, wip do not build