Improved JPA DI.
Additional methods.
Additional test.