Add embedded objects support