Move iBeacons to a handler