Updated Tokens class to be cooler