Added support for datastream types.