dua#define & QueryGenerator#create added