Add tracking calls
VID-1525 Whitespace