(1) Add support for Spring data JPA (including integration with JPA)
(2) Refactoring