Refactoring -> Preparation LocalStore for all services