Added oauth handling