Added address support for xml model.