Moving pickers to the PickerBundle