Inspection for non-primitive classes added