Prepare for refactoring