Start of support for key generation