Add support for @EmbeddedId annotations

Should this be removed?