Add bodyResponse handler
Fix errors