Added cluster query and retrieval.