added custom field handling