add more support to identity request mapper