Update Device.php, XML.php
Update XMLBuilder.php