Add data label support