refactor: NewCommand builds on Client