Added support for generation of labels