Expand type definitions
Better definition of kinds