Added implementation for search by client