Add label support