Preparing for better jpa integration