Updated to use keyID and vCode