Changes to use the api token