Added infrastructure for summary