Fixed new data source object bugs, removed datasource from script cvc.