Change from LazyObject to LazyInstance
Authentication changes