Added Token-Based authentication