Further Refactoring for changelog 2