Adapted to new cluster configuration interface