Refactored SystemWorld