Major structural updates.