EXPERIMENTAL: Manifest update