Clearer labels handling