Add support for multiple lines and long messages