Completd support of repeater