Added Major improvements in Model (Entity) generation