Added conditions for relations
Map the relations