Mozilla bug 809558 - Add stream type support