Add more tracking.