Giving Labels More Context

A small tweak to the labeling system to allow richer context and annotations