Improved parser & serialization
Revert "Improved parser & serialization"

This reverts commit bc05358748e9a445c878468b53e11de45f7ee0d0.