Changes in generator adding contorl for hash