Adding default tracking goals (WIP)