Updated structure.
Return to property id in each model.