Added oauth and some other stuff