More refactoring
Update CHANGELOG.md