Added support for arrows/paths