Adding changes related to jpa