New mechanism for beacon handling