Adding client claims

for review