Change to Picker for Types