JBIDE-3355 StructuredModelWrapper improvement