Added fields to describe leaves more precisely in order to simplify display.