Improve on SVG support