Updated based on latest changes to xml version