Added support for custom authorization/authentication