fixed raw data source instantiation