Removed dependency on JPA