Added !optional to picker extend