HVCI optimization