Use maps instead of slices in state diff struct (#1466)

Use maps instead of slices in state diff struct (#1466) #246