Add find_client feature to shelter