ParseStructure modified