Added code to support picker selection.