Added address labeling support