Added Token auth support