Added new features in generators

Added new handy features in some generators.