Final Changes for XML Loader