missing attributes added and hierarchical relationships renamed
Authored by: mikeward 2015-01-14
Parent: [r3713]
Child: [r3715]