Change gapitoken to generic version