Structural Checking Tool Restructure And Matching Improvements