Refactoring in process. ISpace added