Added cluster discovery