Add relations to work one elements if they exists
Add unit test