Made cluster mechanism more configurable