Added functionality for retrieving data sources and select/unselect