Updated functionality to provide default authentication