Add more types and definitions.