Update xml loader - wip