Update Manifest and simplify things.