Add and remove tokens