Added better auth