Changes to xloader