Some refactoring. Added Changelog.