Adapt to the new structure
More new structure