Add embedded relationships. Fixes #19