Removed manifest_keys namespace