Make SVG plugin better