Added handling models not serialized