Adds claim support