Some work on new tx-structure: srv -> cli