improved JPA and other utility classes
improved utility classes