Better change proposal event handling