More refactoring burden