Use new key structure