refactored EntityInspectionService