renamed SourceParser to MessageExtractor