Added custom fields, per Issue #851