added tokenenhancer