Removed _currentAuthData and renamed some methods