Good idea to limit what is acceptable, and being stricter with validations.

I would also like to consider removing the option @IndexedEmbedded(includeEmbeddedObjectId=true) for similar reasons.