Adapted to the new format of the server