Added more use cases