Changed claims format