Add tracking support