Updated Analysis Functionality