Improved svg.adb