Minor updates to use cases