Added updates for api token authentication