Add more logic to handle message channels