adding support for search operation and token invalidation