Primary key added to temporal model, model definitions generated better