Updated Command class