Moved tracker code to new module