Added check for request types during dispatching