Changed to use JPA Identity strategy