Re-generated map, fixed de-serialization bug