Updated with query optimization data