Added rel type and cardinality values
Added todos