Moved DataSources out of UI