udpate handler for custom callbacks and new reposne object format