Parsing improved