Make label and connection tool more flexible