Multiple additions and refactorings