Improved use cases