Rewriting Siddhi API and Query.