Added beacons support