Updates to pick and picklist