Added type tokens