adapted entity parsing du to new XML schema