diff --git a/srv/zcl_sicf.clas.abap b/srv/zcl_sicf.clas.abap
index 2016c9c..7436b4e 100644
--- a/srv/zcl_sicf.clas.abap
+++ b/srv/zcl_sicf.clas.abap
@@ -10,15 +10,9 @@ CLASS zcl_sicf IMPLEMENTATION.
 
   METHOD if_http_extension~handle_request.
 
-    DATA lv_req TYPE string.
-    lv_req = server->request->get_cdata( ).
-
-    DATA lv_resp TYPE string.
-    lv_resp = z2ui5_cl_http_handler=>main( lv_req ).
-
-    server->response->set_cdata( lv_resp ).
-    server->response->set_header_field( name = `cache-control` value = `no-cache` ).
-    server->response->set_status( code = 200 reason = `success` ).
+   data lo_server type ref to z2ui5_cl_http_handler.
+   lo_server = z2ui5_cl_http_handler=>factory( server ).
+   lo_server->main( ).
 
   ENDMETHOD.