Updated server and auth