Improve samples for pickers