Use custom types instead of custom fields