SPEC-2903: Use a wrapper instead of constructing a command