Updated address tables and corrected xml files