Updated use cases client