Finish changes to wrap up creating underlying data source