Update for summary support