Resolve #46 and scripted data source updates