Adding label/value support

This don't looks like a best solution, but it works for me.