Added token type registry. Closes #45