Make token optional for 'code' calls