Added composite relationship mappings
Merge branch 'dev'