Refactored aspect of reloadableDataSources