Added drill-down feature
Resolved conflict