Allow accessToken to be manually specified
Fix CS