Refactoring: Add Arrow class
Refactoring: Do not use promise because of no need