Attributes are now better located on the XML elements