[system] Refactored