Introduce sub-command scheme