Basic label/value support added