Made Beacon interface more intuitive.