Integrated XML Loader, minor refactors