Handle correctly EmbeddedId