[BackEnd] Refactor