Refactored for JPA after JDO issues deploying to GAE