refactor on indentity storage response object