Fix DataSource initialization