Added diagrams to spec, and updated some diagrams
Merge changes
Update object-properties diagram