Change to use xml instead of zip