Add repeater support