New refactoring file