Fix DataSource serialization