Added updated pick interface