Started adding support for P2SH addresses