Added SVG support