[More refactoring of arrow]