Improving Generator further - Adding entity constructor