Added new handlers, updated client to support multiple channels