Schemas serialization fix