This part is still relevant for adding overview/header data, so I think we should avoid removing it.