Extend comments and add use cases