Adding support for pay to pubkey hash: part 2