Adapting to new structure