InspectorModel redesign