Added support for labels