New use cases and code refactoring