Added support for flat file messaging