Moved class to new namespace
Introduced AuthenticationContext object
Removed old method