Move JPA code to new Storage class.