Merged BotAction with ClientResponse, add TODOs