Added support for arrow expressions