Issue #151

Changes to support dynamic population of custom field values