Optimize & fix command / transaction options setup in Protocol