First version of extended use cases