Added Query handling without waiting to server class.