Add error handling
Change ParserType
Transfer