Added a preliminary query maker