Update RawCommand following refactors in peppercorn