Fix client generator to extend with client keys.