Update handling of apiToken