Adding auth support