Adds self-signed data verification check to key generation