Changed XMLSource code