Handle more custom fields