mapping_options not an internal implementation anymore.
field handling moved back to the Model class.