Fix model, should generate things properly now