Adding in more use cases