Dan: Updated to new EDN Property Definitions