Added auth and some other stuff