Udpated the modelgenerator to support non autoincremeted primary keys