Migration to new generic StructuredModelWrapper