Removing GeneratorCommand dependency.