Improved Generator's performance