Track few things from CM

Signed-off-by: iceandfire <arhamjamal@gmail.com>