Added svg support