ADD: New refactorings