Made modular output and added support for Outlook OLE MSG Files