Move tracking id to a macro