Added initial cluster discovery