Changed architecture to with_svg