working on credentials mapping