Adjust for Pimple 2 syntax
Fix use of SimpleXML Element
Syntax fixes
Add Data classes