Use id instead of token