API cleanups in Authenticate
Extention mechanism for groups