Adding support for labels and values