Updated authentication support