Add framework for drilldown (no functional change)