Renamed factory 'DataSource' to dataSource