Added more general mutable fields support instead of json-specific