improved DataSource initialization