Add pin code handling