Added new Generators, updated custom command, added some improvements.