Add types and TypeTable
typeTable fix