Added better label handling