Doc after refactoring