Updates for keyType gen