Working on commessa use case