Few improvements and changing the auth method.