Track by UUID, refactor tracking factory