Added functionality for new ouath handler