Added some beacon stuff