Added command builder for key retrieval