Added support for beacons