[Update] Refactoring