Refactored beacon management to model class