Prepare for large refactoring