refactored beacon consumer, added Glass support