Added extended tracking support