Generator changed. Added some additional parameters