Update cfr topology to support one topology