Request Handler Improvement

I did some changes in the request handler class. Please have a look
into the edited files.