V2 documentation refactoring