Updated Analysis and Analyze Classes