Add beacons stuff
Fix conflict