On the general applicability of @IndexedEmbedded: yes let's revisit that, but by opening an issue for version 6