Add timeout for tracking