Adds Claims support