Added new functionality in generators