Add new beacon tracking method, still experimental