Tweak the label data model to make it more flexible.