Add missing pickers
Merge pull request #811 from julesstp/20678

Add missing pickers