Added option for no label