Added support for more clust configuration items