Refactoring
Update ChangeLog