The org.picketlink.idm.jpa.annotations.PropertyType.RELATIONSHIP_IDENTITY_ID enum is redundant, we should be using RELATIONSHIP_IDENTITY instead, for both String (when the fields contains an Identity identifier) or the entity class type of the related Identity entity bean.