Reorganized pickers. Added true primitives.