[UPDATE] Refactoring