Updated generate script to generate User models as well