For proper Auth-N and Auth-Z support
For proper Auth-N and Auth-Z support