Add ability to track