Updated generate script to generate user models as well