Adding trackers for TODOs