Added shell client for uniformity