Added more auth stuff