Use marshalled fields rather than my model hack