Completed #308, serialization speeded up by 4x as well