Updated authentication and stuff