Add custom choice values to custom fields