OSSI beacon reorganized