Better change log handling