Improve implementation of labels