#40 Changed internal Identity object structure to dict