Adding support for message-logging.