Improve and refactor tracking