Handle claim set as map instead of proplist