Properly serialize options for model fns. Allow selectable setting and diff modes