Merging back in with message store and logger.