[Refactor] - add memo