Added handling of option-based fieldtypes