Switched to using JPA