Partial Refactoring for changelog 2