Adapted to the new structure