Adapt new structure