Change message to use ComponentBuilder