fixup! Add command codec