Add initial support for raw and field options.