Updated ArrowConnector class