Added support for message types