added support to jpa