Updated xmp loader