Added jpa stuff