Improve labeling and update handling