Large rework of original NFCParser (STSReader)