Fix legacy data source serialization