Adapted to c2s updates.