Before record refactoring