Added missing data_selector logic