Steve Ebersole Does the mapping solution between Session/PersistenceContext and ManagedEntity still exist for non bytecode enhanced Entities? Could we make a change where we revert back to a map if an Entity is associated with more than one Session/PersistenceContext, but retain the one-to-one mapping through enhanced Entities that we have now if the Entity is not already associated with a session?