Change structure to reflect structural changes