Enhance serialization
0.3.17