Edit token retrive improvement