DataSourceController is finished except for version controller for new 'no store name' string change