Refactor + jpa