Changes to support rendering of custom fields in DE (first cut)