Decouple from svg