added beacon support