Added data source selector