- Include missing XML classes
- Ignore more XML related bits
- Use consistent naming in our custom set and get methods