Added tracking feature.