Added support for long arrows
Added support for long arrows