Add Key contractor support for public keys and addresses.