Refactor elements to move set relation Id from container to element
Fix Travis test error