Add refactoring