Made some minor changes to the new xml wrappers