Updated Command interface