Needed to make these work with the new token library