UClaims functionality: almost there