Add more property references for manages tokens