Added key generation