add more auth support