Yup, all of this will be in next round. `Definition` -> `TypeDefinition` by the way.