Improvements on generator and command.