For 5.1, I'll leverage the org.hibernate.metamodel.internal.JpaMetaModelPopulationSetting#IGNORE_UNSUPPORTED and ignore MAP mode entities as you suggested. Should users need access to them for any reason, they can always set org.hibernate.metamodel.internal.JpaMetaModelPopulationSetting#ENABLED.