Improve embedded relations, and allow nested embedded relations