2nd doku refactoring