Started local data refactoring.