Now supports more selective clustering options.