Changed handleRequest structure