Improving serialization.