Added support for msgs