Tied entities together tighter.
Replaced @PersistenceUnit with @PersistenceContext