Refactor for single/multiple beacon mode