simplified internal rnd code not to use query, queryExecutors and response handlers
fixed imports