More XML format clean-up and EngineRef integration
Removed some XML format nesting