Added type token providers and unit tests.