2.1.6 - Add optional streaming support.