- Major refactorings