VE-867: Added more tracking for VE and CK