More changes to custom fields