Base pre refactoring snapshot