Added OAuth support. Currently untested