ChangLog refactoring, because of some PK Issues