VID-1912 Added tracking