Made the beacon optional.