Added Code Inspection support