Latest chnages to support modified XML