Proper cluster discovery