Added support for message files