Add PublicKeyInjection to core tools