added more support for labels