Better beacon data implementation