Added support for id field in embeddeds