Added more highlight and data selection options