Add support for auth