added StateMap