Added composite relationship mappings