Replaced pure JDBC persistence layer by a JPA layer...finally!