Some structural updates.