Add live tracking support