Added in some more use cases