Made omcli easier to extend