Refactored office model