Changed key generation