Adapted to the changes made in the server repository.