Implemented related cardinality support
Managed with couple of TODOs