Add self-tracker