Refactor to use ExecCmd