Update tracking to new API