Query and Inform API redesign