Added tracking of COM