Improve serialize/deserialize about not headers values.
- and some bug fixes.