Datasource wizard new version