Removed file request handler and created single request handler