Completed the addressXmlHandler.