Started migrating to new serialization framework