adding legacy stream type support