Better handling for custom fields