Updated with performance metrics