Structural changes to make post editing easier