Fixed kinds in data types.
Added Message data type.