Unified command options & calling, separated tooling to separate (much lighter) solution