Adapted to new interfaces