Added CommandGenerator