[Application] Refactor