Add stream type support