Improve data selection