Working on better reverse engineering stream types