Updated authentication scheme