Added support for delay query