Updated to use OAuth