Changed key generation to UUID