Adds refactoring