Adding support for arrows