Refectoring to use new Response API
Started to implement new Response API
Started to implement new Response API