Updated use cases