WIP pickers refactoring