Add token and dictmember types.