Add comments on type and include types in core bundle