Added SVG support, dirty hack