Add P2SH support