Added a few missing use cases