Added firing events on source and target update