Added connect label handling