Track more stuff

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