[FIX] Some remnants of using the BaseRequestHandler