Support for embedded objects added