Parsing: Split parse and entity logic